Changes to generate JSON from dsl