sw updates to new CmdEntry