Revert "Removed old CommandMgr"

This reverts commit f3d31dbb6d415db5824bd5970d0128a1f7dd362c.