separate Endpoint from Router