Configuration on demand compatibility

Ensure the plugin is compatible with configuration-on-demand