Update the endpoints

Don't merge yet