refactoring entity and orm