Improved protocol handling, passing NRT