Add better support generic media types