revised Enity to exclude keyspace