Improved handling of the CRUD operations