Forgot to update the NMS support for other classes too.