Updated classes to the new dsl.
Added new dsl.