More work on workflow and preservation state