Updated SPI to make InstanceOrCallable visible to extensions