Improves command tracking