Update to allow additional attributes to be used in Policies