Changes to support ZAP 2.0