Refactored endpoints