User CRUD improvement