INPC refactoring