Refactored extension methods & added some extension methods to improve
compatibility between NR5 and NR6.