Changed fields to come from the module.