Changing user pojo, adding more endpoints
Merging conflicts