Trace/Follow refactor