Updates to account for transition to UUIDs.