Revise traceur support