Milky way and some refactoring
Set group names on MWP subjects