Added header collection

Header collections should be used instead of vectors, hashsets, hashmaps
etc. of header fields