Refactored endpoint system