Migrate storage stuff