Added trace as context