Feature/dsl validator