Added more flexibility to the header