Adding Endpoint class