Refactored, removing the user data to a new model class