Changed KVKeyGenerator to consider previous generated ids.