Refactor DSL methods to be simpler