See #561 & #574. Adding video and audio support for media field.