Refactoring h2unit_string to h2unit_list mode