Updated guard plugin