Added new class constructor