New changes for upgrades assigment