Move dsl to addon