Created static wrapper around ExtensionProvider generic singleton, to avoid code analysis warning
Contract improvements