[Analyzer] Fix non integrating architecture