Updated build
Updated to export module defs