Finished json and improved XACML core with some re-factorings