Update to module API to pass module as arg