Fill in some more data mappings