Refuctored DSL