DSL implementation update
fix routes