Adding infrastructure for HTA2