Add Analyser and MapAdapter