Add CommandManager to replace responder