Towards #51: Propagating the storage type