Can you add the metadata discussed in issue #167 to these?