Add branch trace support