Add Group and Subgroup entities