CRUD compliance modifications