Add headers and parsing tool