Formatted entities in clients

Formatted entities in clients