Added NZPre support