entity refactoring
entity refactoring