Updated Plugin utilities