Added support for other file types.