Added trace ability