Replace hard coded nwr enumeration support with a more generic