Update the parent class to make use of the new class structure