update for storage support