Accommodated the latest changes to the Media module.