moved some storages to storage table