1.5 Support

Modified how NMS is stored