Removed some boilerplate in builder. Also added basic CreateHIT support.