Refactored User service
Fixed merge issues
Fixed build issue