added Zephyr and Zapi integration