Add notion of StorageType