Added msz/tna/npw