Added support for file types