Major overhaul of endpoints.