NMS-6016 make this return a content type