Adding HK104 and AF16