Extension refactoring