Moved functions from commandManager to their right module