1) Added inital trace support