Added a ZAP wrapper for psiinon