UseExtension refactored