Updates to reflect changes in the extract from emop per Matt