Another patch to provide a proper DSL P2 again