more work on User entity