Npa refactor