Draft of public client support