Added new classes to be able to distinugish between header and other uses