Clients model streamlined