Updated for new module.