Add support for nms 17R1 and 17R2

It was easy, just copy-paste and fix imports