Fixed up the Media Presentation models to mirror the final XML format