You're right I will change the code and test it for smooth upgrade.