Added support for other mime types