Add storage availability
Fix storage availability