Grouping now supported outside of context manager functionality