more extensibility improvements