Make create_base_storage behave more like mgd, which should make it run much faster