Updating to meet module spec.