Improve support for Higgs analysis