Add support for legacy guard policies