Minor modifications. Ready for setting up the TDObjectGroups too.