Added xe16 support