Updated Attributor code