Update docs with named groups and updated macroclass