Add updated_branch_loop that has proper host_ids