More work on 1.7 update
- Preparing for versioned NMS to allow multiple version compatibility.