Added support for header files, changed priorities