Add support for tracing ns