Use trace headers where applicable