CRUD refactoring