ContentClient/Host re-work