added Endpoint mapping