Updated formatter with new header info