Moved analyser class and introduced interface to support multiple use cases