Revert "Revert "Update for the plugin""

This reverts commit 7c2a62ebeb7370dc5dc59c73b8978789eb91f9dd.