Closes #548 by adding ZAP mappings.