Upgrade for latest backbone