Aligned templates with new ddd dsl version