Extension refactoring #2