Improve Users model