Changed patterns for input attributes of CmdParser. Some little changes.