Updates to command system