Added support for more formats.