Added loading protection to the new plugins