Add ObjectGroup optimization