Improved jsml format