Update support for more IBTL.