Refactored for easy access to endpoints
Refactored for easy access to endpoints