Add a Config class, check evidence more carefully