ExtensionsWrapper class added, refactored