Add hbng support for 18