Framework changes