Additional changes to facilitate CRUD operations