LPS-50604 Adapt upgrade processes to the same structure used in bookmarks