Crud refactoring