[RFT] Refactor classes to reflect API changes in pt_extbase