Specified a policy set and with_condition syntax
Work in progress rewriting to use PolicySet