Support HTL21 and SOL21