Overall ObjectAssigner refactoring