Added tracing with Trace
Changed Trace to SimpleDataTraceSources