Updated to reflect the latest extension stubs