Moved all user-related methods to user.py