Simplified & unified the endpoint-paths