aligning with new plugin functionality