Extensibility refactoring

No match.