Close to moving all storages to storage table