Small update to command system