#GT-985: added classes for dsl