Simplified entity test, added stats for exchanges
Added new key type for entities, useful to allow empty keys