TBD-1303 fixed: Move the header spark code to the additional file