CAPEDWARF-180 Add Endpoints support
Refactor Endpoints support.