Moving to scope
Added support in dsl for nesting