Re-added endpoint stuff