Some CRUD-related improvements.