Support newer Guard versions