added more checks for upgrade scenarios