Added more support for tabGroups