Move DSL back into CoreDsl trait