Add command and tool tracking.