Adding support for multicommand