Changes for external storage