Integrated unit_group schema into core