Output structs in dictionary for extraction

This is to address #344.