Added support for multiple word commands