CRUD enhancements