Finalize transition to MSON syntax