Changes to analyzer