Improve builder for H2HNode