Adapting QR to the new class definition