Added support for more file types.