Moved a method into Plugin (that was missed earlier)