Added "trace" option