Changed class definition