Harmonized tracing with AS

Using the same Tracing helper now as in AS