Intial commit for advanced tracer
Fixed compilation issues