Conforming to the new class signature