Could you update the trace hook to trace these members too?