improved the detection & translation of restricted types