Add HeaderSize field
Rename HeaderFields to HeaderFieldList