Added regex support for commands