MADS: Some refactoring in scene group 7