Improve upgrade path for managed objects