Simplify stuff
Add all endpoints