Better check for storage