Add npi analysis