Support shortInstrumentName
Support for staff groups
Continue restructure