Trace msgs revamped