Small change for storage support