Changed architecture. Renamed class.