Adding groupings and config