Changes to entity.

As either doesn't return a map we can merge with and we need to be able
to have 2 types of identifiers.