Closes #548 by adding ZAP mappings.
Merge commit '38e238a06b816cdfed72d5d9f7b202f77000754a' into HEAD