Enhanced User entity