Add NER/NEII, Update WAILA/WAWLA