Add support for module select.