Added headers
Added header iterator
Use iter::Map