Adds trace support