Modified - partially - to support new Intervention API