Changes to support module selection.