Changed over the content/media type mappers to be auto-mapper based