Handle media types too