Grouping refactoring - Used DoAddObject, DoRemoveObject