I see why you did this, because all the headers are service specific.  I agree it would be nice to have this out of the class itself though.