CAPEDWARF-180 Add Endpoints support