Made Tracing internal
Added Hawk