Continue Work on User API