Added foundation for Tracing.
Added sort by priority/match string