Initial upgrade of 2.0.0 and new DSL methods