Update the tpa list build logic