Code refactoring on DB Model