CRUD improved