Extension points refactoring