Added command generator