add support for headers as per design doc