Added trace option to client