Work on refactoring on user module