First revision of CMDparser