Improved Analysis class.