Changes to add tracing and replaying command-line options