Moved methods to analysis plugin