Updated DSL to be more usable with static usings