Make ZAP optional for CURVE mechanism