Move some storages to storage table