EntitySet refactoring.