Add trace support