Define Command_Number let more flexible