Upgrade content references extraction