CRUD refactoring.