Changed the working principle of Commands enumeration