Analyzer modified to support short addresses