Updates for HT to be forked