Added storage access and storage setting