Small changes in examples to be compliant with new DSL