Changes due to Studio upgrade