Add trace id feature