Added group/collection relations to variables models