Ensure Global IDs are specified

[RobertJCarroll]

There is some ambiguity about what entities require global ids and what entities don't need them. We will do a pass specifying them in the ID field for the entity.