Wire up remainder of the module export matching