JsonAnaliseGenerator refactored