Better support for groups and hierarchy within file