; (2) the Executive Office of the Bureau of Near Eastern Affairs and South and Central Asian Affairs of the Department of State; (3) the Consular Section of the United States Embassy in Kabul, Afghanistan; (4) the Consular Section of the United States Embassy in Baghdad, Iraq; (5) U.S. Citizenship and Immigration Services of the Department of Homeland Security; (6) the Department of Defense; (7) nongovernmental organizations providing legal aid in the special immigrant visa application process; and (8) wherever possible, current and former employees of the offices referred to in paragraphs (1) through (6). 304. Improvements to application process for Afghan special immigrant visas Section 602(b) of the Afghan Allies Protection Act of 2009 ( 8 U.S.C. 1101 note) is amended— (1) in paragraph (2)(A)(ii)— (A) in the matter preceding subclause (I), by inserting for the first time after September 30, 2015 ; and (B) in subclause (I)— (i) in item (aa) by inserting for the first time after subparagraph (D) ; and (ii) in item (bb) by inserting for the first time after subparagraph (D) ; and (2) in paragraph (4)(A) by inserting, , including Chief of Mission approval, after so that all steps . 305. Special immigrant status for certain surviving spouses and children (a) In general Section 101(a)(27)(D) of the Immigration and Nationality Act ( 8 U.S.C. 1101(a)(27)(D) ) is amended— (1) by striking an immigrant who is an employee and inserting the following: “an immigrant who— (i) is an employee ; and (2) by striking status; and inserting the following: “status; or (ii) an immigrant who is the surviving spouse or child of an employee of the United States Government abroad: Provided , That the employee performed faithful service for a total of not less than 15 years or was killed in the line of duty