Updated auth en user model for better readability and code structure