Add support for Stats headers