major refactorings in analyses plugins