Some changes to User entity class