[April-03] End Points component