Add support for headers for calculated fields.