Added support for multiple versions of an entity at the same timestamp