GENE-283: some improvements for the module.