Updated user entity mapping to include all fields.