Sunset #1 endpoints refactor