Added all endpoints (1st draft)