CRUD improvements