Handle external storage state changes
Better handling of storage states