Corrected class extension