Replaced old class.