Switched to using the User class