Moved some storages to storage table