Simplifying the command system