Cheddar/updates for suspends

@jebeck @kentquirk 

These are the updates to line up with the updated data model.