Added SuperMsgCollection obj
Changed some names
Merge remote-tracking branch 'origin/master'