Updated code to use new media type defs