Common plugin edits