massive entity refactoring