Add request and response headers support