Expanded NRPE support