Some Plugin Changes