Added support for property header