Added support for header stuff