Upgrade for data hook