Add trace calls