Added support for server/service tracing