Added support for files with headers