Extendability fixes in PHP version