Added support for ObjectGroups and Objects