Added additional state to TokenEntity to differentiate new vs updated
entities.