Updated SelfHost sample