Updated selfhost sample