Re-factored endpoints