Refactoring
DB model entities