Add analysis code changes