Added 6 more headers