Crud/Rest refactoring