Module Additions to Zephyr and Omnicron