Changed regex for commands