Enhancements to new plugin approach