Adding DataWrapper to allow unique content-type