Update for new framework variables.