Added support for CmdConstants, exceptions