Addition of Raw trace support + test