Generalized HFile implementation #19