Crud refactoring finished