Adjust to latest DSL changes