Updated DSL with more convenient methods