better support for upgrade operations