move to StorageUtil