Expanded support for Configurable editing.