Updates to support fixed guard policy types