Removed default endpoints for base class
Rename end_point to endpoint