Extensibility improvements