Add ServerHost property and fix Client => IClient