user entity improvement