Added new classes for the DSL