I'm not sure if there's any way to not break legacy pickles during this process. The Blocks and BlockManager should be extension classes