1) Added support for icommand wrappers.