Improve android/storage