MSON AST reflecting the new specification

For @fosrias, @honzajavorek and @pksunkara to review. 
True, it shouldn't be in the AST yet, at all.