Elements: base elements services added, GroupSorter added to Generator