WithinRange and KVStore Changes