Updated to reflect changes in xacml-core