Start refactoring to make it easier to use extended entities.