Some Framework changes