Cleaned up endpoints